From 683d0550a4c0b18e1c6a9a42090fe53a12b4f329 Mon Sep 17 00:00:00 2001
From: =?utf8?q?=C3=98yvind=20Kol=C3=A5s?= <ok@src.gnome.org>
Date: Wed, 1 Aug 2007 21:50:23 +0000
Subject: [PATCH] Fixed compiler abort on certain LDFLAGS values (-Wl,-z,defs)
 by applying patch from christopher taylor, closing bug #462536. *
 babl/Makefile.am: * extensions/Makefile.am:

svn path=/trunk/; revision=234
---
 ChangeLog              | 8 ++++++++
 babl/Makefile.am       | 4 ++--
 extensions/Makefile.am | 8 ++++++--
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d3671a9..5e56f3d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-08-01  Øyvind Kolås  <pippin@gimp.org>
+
+	Fixed compiler abort on certain LDFLAGS values (-Wl,-z,defs) by
+	applying patch from christopher taylor, closing bug #462536.
+
+	* babl/Makefile.am:
+	* extensions/Makefile.am:
+
 2007-03-21  Øyvind Kolås  <pippin@gimp.org>
 
 	Reindented all of the code using uncrustify.
diff --git a/babl/Makefile.am b/babl/Makefile.am
index 53de1d9..9306592 100644
--- a/babl/Makefile.am
+++ b/babl/Makefile.am
@@ -53,6 +53,6 @@ libbabl_@BABL_API_VERSION@_la_LIBADD=\
 	base/libbase.la \
 	@LTLIBOBJS@
 
-libbabl_@BABL_API_VERSION@_la_LDFLAGS= \
-	${no_undefined}                \
+libbabl_@BABL_API_VERSION@_la_LDFLAGS= 		\
+	${no_undefined} -ldl $(MATH_LIB)	\
 	-version-info $(BABL_LIBRARY_VERSION)
diff --git a/extensions/Makefile.am b/extensions/Makefile.am
index f8d3a5d..671c6ca 100644
--- a/extensions/Makefile.am
+++ b/extensions/Makefile.am
@@ -17,7 +17,11 @@ CFLAGS  += -I $(top_srcdir)/babl -I $(top_srcdir)/extensions -fPIC
 
 LDFLAGS += -shared
 
-LDADD    = $(no-undefined) $(libbabldlla)
+if OS_WIN32
+LDADD    = $(no-undefined) $(libbabldlla) $(MATH_LIB)
+else
+LDADD    = $(top_builddir)/babl/.libs/libbabl-$(BABL_API_VERSION).so $(MATH_LIB)
+endif
 
 %$(SHREXT): %.c
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDADD)
@@ -28,7 +32,7 @@ LDADD    = $(no-undefined) $(libbabldlla)
 #	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $<  [own compile and link flags]
 
 CIE-Lab$(SHREXT): CIE-Lab.c
-	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDADD) $(MATH_LIB)
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDADD)
 #lcms$(SHREXT): lcms.c
 #	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDADD) `pkg-config lcms --cflags --libs`
 #############################################################################
-- 
2.30.2